feat: uplift dependencies and update to support `ink-v6.0.0-alpha` #143

chungquantin · 2025-04-17T05:27:34Z

The PR uplift all dependencies to use latest version of ink! crate (v6.0.0) and migrate all code logic to support pallet-revive. Key critical changes made:

With the removal of type Debug in ChainExtension, the feature to mock contract calls fail completely and requires alternative approach using tracing API to support the feature.
Migrate examples/quick-start-with-drink to test with tracing API instead of decoding debug_message (which is removed in revive).
Disable test examples/chain-extension (chain extensions are deprecated in pallet-revive) and adds todo for a similar precompile replacement.

Examples Tracking

TO BE FIXED

Aside from all TODOs and deprecated calls of MockExtension, below issues need to be resolved:

examples/cross-contract-call-tracing: Consider implement the alternative tracing approach with the new Debugging Strategies
examples/mocking: Need to implement alternative approach without type Debug in ChainExtension
Issue: fix: Replace chain-extension test with similar precompile test #140 |examples/chain-extension: chain extensions are deprecated and replaced with precompiles in pallet-revive Current issue is the Memory trait in pallet-revive is required for the implementation of the chain extension but the Memory trait is in wasm module which is not exported as public. In the chain extension implementation of Pop Network, we forked the pallet-revive and modified it. Probably deprecated in the future with the introduction of precompiles.

* feat: migrate to revive (issue with revive_api) * feat: migrate to revive for drink and cli * fix: format * chore: update Cargo.toml & lock file * chore: update gitignore and remove .vscode * fix: flipper example contract * chore: update lockfile * fix: example contracts * fix: cli layout constraint params & example contracts * chore: description for storage deposit limit * chore: use ink main branch * chore: resolve review comments * chore: add dummy polkavm binary * fix: call() string parameters * chore: update multiple-contracts test * chore: rename read contract code binary method * chore: add comment * chore: fix example contracts * chore: update multiple_contract test * fix: multiple contracts test * chore: resolve review comments * refactor: read_contract_binary

* chore: update dependencies to support ink v6 alpha * chore: update Cargo.lock * chore(mock): remove DrinkDebug and intercept calls * chore(examples): bump lockfile and sync ink! v6

examples/chain-extension/src/chain_extension_runtime_side.rs

chungquantin · 2025-05-08T06:20:07Z

Note to the reviewers:

This PR is quite big due to the merge with feat: uplift dependencies and implement revive chungquantin/drink#2 (which was reviewed and approved by two reviewers). Recommend reviewing following these changes.
This PR introduces breaking changes to some drink functionalities: contract call intercepting (feat(revive): alternative approach to intercept contract calls #144) & tracing API (feat(revive): alternative tracing approach to debug contracts #145) but the basic uses of drink still work as expected, see above working example contracts.
I think it makes more sense to resolve other issues in separate PRs and marks not working features as deprecated until we solve them.

drink/src/session/mock.rs

examples/cross-contract-call-tracing/lib.rs

examples/quick-start-with-drink/lib.rs

rust-toolchain.toml

examples/multiple-contracts/Cargo.toml

Cargo.toml

examples/chain-extension/Cargo.toml

examples/dry-running/Cargo.toml

examples/flipper/Cargo.toml

examples/quick-start-with-drink/lib.rs

drink-cli/src/executor/mod.rs

drink/src/session/mock/extension.rs

.github/workflows/rust-checks.yml

davidsemakula · 2025-05-21T16:48:56Z

drink/drink-cli/src/executor/contract.rs

Lines 121 to 139 in 94835ac

    
           fn find_wasm_blob(cwd: &Path) -> Option<(String, PathBuf)> { 
        
               let Ok(entries) = fs::read_dir(cwd.join("target/ink")) else { 
        
                   return None; 
        
               }; 
        
               let file = entries 
        
                   .into_iter() 
        
                   .filter_map(|e| e.ok()) 
        
                   .find(|e| e.path().extension().unwrap_or_default() == "wasm")?; 
        
               let raw_name = file 
        
                   .file_name() 
        
                   .into_string() 
        
                   .expect("Invalid file name") 
        
                   .strip_suffix(".wasm") 
        
                   .expect("We have just checked file extension") 
        
                   .to_string(); 
        
               Some((raw_name, file.path())) 
        
           }

@chungquantin Looks like this (and may be its callers) need to be update to work with .polkavm binaries.

chungquantin · 2025-05-23T09:07:10Z

fix(drink-cli): support polkavm and fix address

Fixed in 4b54e6f

davidsemakula

Thanks @chungquantin !

chungquantin added 2 commits April 17, 2025 12:18

chore: update dependencies to support ink v6 alpha (partially) (#3)

2d90c74

* chore: update dependencies to support ink v6 alpha * chore: update Cargo.lock * chore(mock): remove DrinkDebug and intercept calls * chore(examples): bump lockfile and sync ink! v6

chungquantin commented May 6, 2025

View reviewed changes

examples/chain-extension/src/chain_extension_runtime_side.rs Outdated Show resolved Hide resolved

chungquantin added 3 commits May 6, 2025 12:16

chore: update crate metadata and toolchain

3700c70

chore(brand): update to use-ink organization

6d911d6

refactor!(revive): remove intercept & debug logic

9f00ed6

chungquantin marked this pull request as ready for review May 8, 2025 06:20

This was referenced May 8, 2025

feat(revive): alternative approach to intercept contract calls #144

Open

feat(revive): alternative tracing approach to debug contracts #145

Open

chore(deps): update lock file for ink latest version

32cc2f4

davidsemakula self-requested a review May 20, 2025 08:22

chore(clippy): resolve clippy warnings

2533086

evilrobot-01 marked this pull request as draft May 20, 2025 13:48

evilrobot-01 marked this pull request as ready for review May 20, 2025 13:48

chore(docs): update README.md

1a36f51

chungquantin commented May 20, 2025

View reviewed changes

drink/src/session/mock.rs Show resolved Hide resolved

chungquantin commented May 20, 2025

View reviewed changes

examples/cross-contract-call-tracing/lib.rs Show resolved Hide resolved

chungquantin commented May 20, 2025

View reviewed changes

examples/quick-start-with-drink/lib.rs Show resolved Hide resolved

davidsemakula requested changes May 21, 2025

View reviewed changes

chungquantin added 5 commits May 23, 2025 15:15

chore: add credits to original authors

2592fe7

chore: remove targets in rust-checks ci

06e6f99

chore: add TODOs in quicl-start-with-drink test

410a6a1

fix(drink-cli): support polkavm and fix address

4b54e6f

chore(drink/mock): comment out MockExtension

f9b2919

chungquantin requested a review from davidsemakula May 23, 2025 09:33

davidsemakula force-pushed the chungquantin/ink-6-alpha branch from 9046a40 to 57ddac2 Compare May 28, 2025 17:19

davidsemakula approved these changes May 28, 2025

View reviewed changes

davidsemakula force-pushed the chungquantin/ink-6-alpha branch from 66119f0 to 36c91de Compare May 28, 2025 19:21

davidsemakula added 7 commits May 28, 2025 22:32

chore: clippy

7e4934a

chore: Use v6-alpha for ink and cargo-contract dependencies

8b2cf1b

chore: disable chain extension example and add todo for replacement

4f85949

fix: CI

8321ce4

ci: Use latest stable Rust

5946712

chore: remove fixed toolchain

909228b

ci: share cargo target dir for examples

58c778c

davidsemakula force-pushed the chungquantin/ink-6-alpha branch from 36c91de to 58c778c Compare May 28, 2025 19:34

davidsemakula merged commit 51beb81 into use-ink:main May 28, 2025
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: uplift dependencies and update to support `ink-v6.0.0-alpha` #143

feat: uplift dependencies and update to support `ink-v6.0.0-alpha` #143

Uh oh!

chungquantin commented Apr 17, 2025 •

edited by davidsemakula

Loading

Uh oh!

Uh oh!

chungquantin commented May 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidsemakula commented May 21, 2025

Uh oh!

chungquantin commented May 23, 2025

Uh oh!

davidsemakula left a comment

Uh oh!

Uh oh!

Uh oh!

feat: uplift dependencies and update to support ink-v6.0.0-alpha #143

feat: uplift dependencies and update to support ink-v6.0.0-alpha #143

Uh oh!

Conversation

chungquantin commented Apr 17, 2025 • edited by davidsemakula Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Examples Tracking

TO BE FIXED

Uh oh!

Uh oh!

chungquantin commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Note to the reviewers:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidsemakula commented May 21, 2025

Uh oh!

chungquantin commented May 23, 2025

Uh oh!

davidsemakula left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

feat: uplift dependencies and update to support `ink-v6.0.0-alpha` #143

feat: uplift dependencies and update to support `ink-v6.0.0-alpha` #143

chungquantin commented Apr 17, 2025 •

edited by davidsemakula

Loading

chungquantin commented May 8, 2025 •

edited

Loading